x11: Don't pass a GdkEvent to shape cache filters

The filter functions never look at that event, and
we want to get out of the business of passing half-
constructed events around.

diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index c369ca031669939b8dadd7f6061647de9b5e7470..577037be7265c3692e0d4890bf5736a75c9ab9ef 100644 (file)
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -354,7 +354,6 @@ gdk_surface_cache_add (GdkSurfaceCache *cache,
 
 GdkFilterReturn
 gdk_surface_cache_shape_filter (const XEvent *xevent,
-                                GdkEvent     *event,
                                 gpointer      data)
 {
   GdkSurfaceCache *cache = data;
@@ -388,7 +387,6 @@ gdk_surface_cache_shape_filter (const XEvent *xevent,
 
 GdkFilterReturn
 gdk_surface_cache_filter (const XEvent *xevent,
-                          GdkEvent     *event,
                           gpointer      data)
 {
   GdkSurfaceCache *cache = data;

diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index 01d48a7eff124a23fb00fec61c7f508181549bfe..dad87eb6df52009757d2e8a46cab551e2a3d86fc 100644 (file)
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.c
@@ -240,7 +240,7 @@ gdk_event_source_translate_event (GdkX11Display  *x11_display,
 
   /* apply XSettings filters */
   if (xevent->xany.window == XRootWindow (dpy, 0))
-    result = gdk_xsettings_root_window_filter (xevent,x11_screen);
+    result = gdk_xsettings_root_window_filter (xevent, x11_screen);
 
   if (result == GDK_FILTER_CONTINUE &&
       xevent->xany.window == x11_screen->xsettings_manager_window)
@@ -250,11 +250,11 @@ gdk_event_source_translate_event (GdkX11Display  *x11_display,
   if (cache)
     {
       if (result == GDK_FILTER_CONTINUE)
-        result = gdk_surface_cache_shape_filter (xevent, event, cache);
+        result = gdk_surface_cache_shape_filter (xevent, cache);
 
       if (result == GDK_FILTER_CONTINUE &&
           xevent->xany.window == XRootWindow (dpy, 0))
-        result = gdk_surface_cache_filter (xevent, event, cache);
+        result = gdk_surface_cache_filter (xevent, cache);
     }
 
   if (result == GDK_FILTER_CONTINUE)

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index ff32ea7642e7d084e5da2cda5207995353f7d9df..0f8ca877654e3cdd10c38833192e24e4ec78726d 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -212,11 +212,9 @@ gdk_surface_cache_get (GdkDisplay *display);
 
 GdkFilterReturn
 gdk_surface_cache_filter (const XEvent *xevent,
-                          GdkEvent     *event,
                           gpointer      data);
 GdkFilterReturn
 gdk_surface_cache_shape_filter (const XEvent *xevent,
-                                GdkEvent     *event,
                                 gpointer      data);
 
 void _gdk_x11_cursor_display_finalize (GdkDisplay *display);